Version bump (#240686).

(Portage version: 2.1.4.4)

3 files changed, 14 insertions, 41 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 42fb7ae8a4bc..f18866c3b0c0 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/dansguardian
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.36 2008/08/23 02:52:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.37 2008/10/09 20:07:27 mrness Exp $
+
+*dansguardian-2.10 (09 Oct 2008)
+
+  09 Oct 2008; Alin Năstac <mrness@gentoo.org>
+  -files/dansguardian-2.9.9.4-gentoo.patch,
+  -dansguardian-2.9.9.4_beta.ebuild, +dansguardian-2.10.ebuild:
+  Version bump (#240686).
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/net-proxy/dansguardian/dansguardian-2.9.9.4_beta.ebuild b/net-proxy/dansguardian/dansguardian-2.10.ebuild
index d2402c870d8d..465b09ec8e3c 100644
--- a/net-proxy/dansguardian/dansguardian-2.9.9.4_beta.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.10.ebuild
@@ -1,25 +1,21 @@
 # Copyright 1999-2008 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.4_beta.ebuild,v 1.1 2008/05/14 21:21:49 mrness Exp $
-
-inherit eutils
-
-MY_P=${P/_beta/}
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.ebuild,v 1.1 2008/10/09 20:07:27 mrness Exp $
 
 DESCRIPTION="Web content filtering via proxy"
 HOMEPAGE="http://dansguardian.org"
-SRC_URI="http://dansguardian.org/downloads/2/Beta/${MY_P}.tar.gz"
+SRC_URI="http://dansguardian.org/downloads/2/Stable/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="clamav kaspersky debug ntlm pcre"
 
-DEPEND="pcre? ( >=dev-libs/libpcre-6.0 )
+RDEPEND="sys-libs/zlib
+	pcre? ( dev-libs/libpcre )
 	clamav? ( >=app-antivirus/clamav-0.93 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 pkg_setup() {
 	if has_version "<${CATEGORY}/${PN}-2.9" ; then
@@ -40,12 +36,6 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P%_beta}-gentoo.patch"
-}
-
 src_compile() {
 	local myconf="--with-logdir=/var/log/dansguardian
 		--with-piddir=/var/run
@@ -90,18 +80,6 @@ src_install() {
 
 	keepdir /var/log/dansguardian
 	fperms o-rwx /var/log/dansguardian
-
-	# TODO : see if no-default-lists.patch and these linea are still needed in next version
-	local f
-	touch "${T}"/emptyfile
-	insinto /etc/dansguardian/lists
-	for f in exceptionfileurllist bannedregexpheaderlist logsitelist logurllist headerregexplist logregexpurllist; do
-		if [ -f "${f}" ] ; then
-			einfo "${f} already exists"
-		else
-			newins "${T}"/emptyfile ${f}
-		fi
-	done
 }
 
 pkg_postinst() {
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.9.4-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.9.9.4-gentoo.patch
deleted file mode 100644
index b7aac8591383..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.9.9.4-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru dansguardian-2.9.9.4.orig/doc/dansguardian.8 dansguardian-2.9.9.4/doc/dansguardian.8
---- dansguardian-2.9.9.4.orig/doc/dansguardian.8	2006-10-30 13:58:08.000000000 +0200
-+++ dansguardian-2.9.9.4/doc/dansguardian.8	2008-05-15 00:11:36.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
-