Revision bump, force people that are not running stable to use >=dev-libs/libpcre-8.32. Fixes bug #417679 reported by Tomas Mozes. Dropped old, will drop current stable once future stabilization is done.

Package-Manager: portage-2.1.11.60/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

6 files changed, 31 insertions, 280 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 8caec8248ed9..ba467c46d4e8 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-proxy/dansguardian
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.55 2013/04/01 10:28:30 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.56 2013/04/09 18:36:01 tomwij Exp $
+
+*dansguardian-2.10.0.3-r1 (09 Apr 2013)
+*dansguardian-2.12.0.3-r2 (09 Apr 2013)
+
+  09 Apr 2013; Tom Wijsman <TomWij@gentoo.org> +dansguardian-2.10.0.3-r1.ebuild,
+  +dansguardian-2.12.0.3-r2.ebuild, -dansguardian-2.10.1.1-r1.ebuild,
+  -dansguardian-2.10.1.1-r2.ebuild, -dansguardian-2.10.1.1.ebuild,
+  -dansguardian-2.12.0.3.ebuild:
+  Revision bump, force people that are not running stable to use >=dev-
+  libs/libpcre-8.32. Fixes bug #417679 reported by Tomas Mozes. Dropped old,
+  will drop current stable once future stabilization is done.
 
 *dansguardian-2.12.0.3-r1 (01 Apr 2013)
 
diff --git a/net-proxy/dansguardian/Manifest b/net-proxy/dansguardian/Manifest
index 1403df143a0d..712fa9164600 100644
--- a/net-proxy/dansguardian/Manifest
+++ b/net-proxy/dansguardian/Manifest
@@ -4,13 +4,10 @@ AUX dansguardian-2.10.1.1-pcre830.patch 2468 SHA256 8686b5d845642ff74f4706559c77
 AUX dansguardian.init 1072 SHA256 0571d916c6464645a1ae46e7c191a0225c779f07542173d76d5d2955f6f93895 SHA512 c86f19c0ba16f4bed2ff9b10b0c26e20cd4558ef9d1b00b28fa03463a0e868db0b2b46671f7cbf124c0c5431b8557fdd9d3ea4ffc01ad1162c5aeca492ab3464 WHIRLPOOL 3f184c54fff1facb2efd9f1173982f2c482ab1843606926fa1356a82f0ba353be7b5403a6a0d8148299f1879a51c280a8570e159e223277f5786ba0a0b087b50
 AUX dansguardian.logrotate 188 SHA256 124775c1a6dd20652e7b7511bb484c654ac63cc0c0a2baf2357d8ce7086867a2 SHA512 ec272a14f88cd1939272e4a689602b784236bf2fb25d1d7fd720f4d998028d7e1d6ba520d7044e1fef14838caa18ec19224d1cfbe04318b14316fe507e9d13dc WHIRLPOOL 547f10ea51af68a29355adc6acd1122817f1ca1335566588dd2acb71fc444a40cbb3cacf9ee6ead4ed29a0e35d91eb8ff91d20423644b2d72fe8f30db8ec5d18
 DIST dansguardian-2.10.0.3.tar.gz 512695 SHA256 419be86f472ad0a69a8a15857a646271ac9739d29bd836be9159f2d955e5b963
-DIST dansguardian-2.10.1.1.tar.gz 516800 SHA256 c245d58cf37f79f8a8e50b684d62b797a9f6ce1bb775e140969002dff7e11f92
 DIST dansguardian-2.12.0.3.tar.bz2 577701 SHA256 c74e9a32b97f9a9a056fced3da23fe48fca2bc6aa9af670afe9a53dc819414f5 SHA512 37155ef4f1a6dd6bdd87f79c7199b77de49746e4bff0631c239a569c21bf26240cbc9eae5a2436653bfc3d170a664710af9d80c4cfac3082a0620caeaac6740b WHIRLPOOL 64f64161a3dbf48c122fbf341ac8a7b4892be2049d1ac05948e9aa8c4cb927efa6ce929404b60c43f67457268f3c432b0ff109fb333ffe8ab84bba0b528b52eb
+EBUILD dansguardian-2.10.0.3-r1.ebuild 3226 SHA256 746a5beb62ccce01f45b2847fbb0ff1e9370a41ed5fa88e3843990a5eafba8f8 SHA512 af0e3229697bee03546103faaea8b0a7d3d6e01093093d4250e3871139d53a69db281948f5a9481086c31b916acfa35533c4600569980b722060986bf726d0f9 WHIRLPOOL 346d6d3c93236330b736b7c3268883066499ed62e2f14fbb6c38e47748f0210db957a152b039e222140c9b948a9660243c6eca44515febfb4d67e2ba0c25e4dc
 EBUILD dansguardian-2.10.0.3.ebuild 3212 SHA256 bdf127e30786651c447087d0bdf31f18731cf2d3c993df169c600b8cbb535cea SHA512 848af2ac1c818ef936a06f7206324820b5664420daae4844d692e95878fbda7da22ffc2ea6148934f726d3eec584846c9a452b7aab8399c0ae5593ee5c00b6f5 WHIRLPOOL 476689a7471816f319f96e7ed5d5cf2ffc8be780ed30a057242d819518caaf731c9092d3d1ff35ab367ec1c4fdd7a11908dad4b8e41ebeb7884a798ff294a5d4
-EBUILD dansguardian-2.10.1.1-r1.ebuild 3690 SHA256 5524a741a4374333c6fb8714b0f2a0712402ba699e17a7246c27924f97f8bffc SHA512 4151a9c892dba63d22b00ba59e90e1e2387d1bab246004fbe7f953c335b15f2dc66e34c68e93dda9dcc7dd9b3497be6522db652dd84a4adcc54d5b32a52f0b41 WHIRLPOOL b1a67402f19f65ce4dee926311e7ef2a5e80588a345e8e04930caeaf6b3a1fb09db08f53595cc708976d6d91292c32e31595976a0e043fa0999bee560daf8432
-EBUILD dansguardian-2.10.1.1-r2.ebuild 3731 SHA256 42144b6697aaa59e6ef87e3af5631a4db315eb4061e5cc51f0180a01702aa30e SHA512 9d06176e402d73826da5a348b03129a424047b0a2496d7dfca9b7c9ed95ec19bd787f743df3fa52457148abc0f27728d40f86fe94226006c8f6e7f0f3d026dfc WHIRLPOOL d4988ad239a2a0662161211f6166097cc36f915b462bd210f2bbf4ed239848a0da278720dc7d8d70275569f369290ce796cbd830f1eb2e5c8c22e46bc060f8e0
-EBUILD dansguardian-2.10.1.1.ebuild 3254 SHA256 706e17fade848ea78b89fdb282bdbff11d490c2f7c83d06383893d8e2e2d8679 SHA512 ccc9c066916994119bc20a432a81854e4baaae8d2aab12a8079629e74c850f1e9ab296f722e89f4bb6eedbda4c69c3e83b9fd403c2e50e4647bf617c18f61ce5 WHIRLPOOL b6be026ac2426a7ceb9e66beb80d3fa272b690ea3be877d8fc39030186eb12912100400d33d9862b131a02c544d31d02a184665ab340bb5d4e7caeb85a42677c
 EBUILD dansguardian-2.12.0.3-r1.ebuild 2905 SHA256 94839312a754c219ad36c56228323a28937a4afbcbf833111f289198ad142142 SHA512 d2ea26190e2cf5eca30cda6bc4181e68e9d495d1023f36b6dbdb5253b3832c12b83347bbf86234a825554bb00c544afa7ea7ae510c0cb564d5df4786de1176f6 WHIRLPOOL 4b4e0f5fd1600cc8fa44754d0cfd151875c1189050f25573a6a0d5de386a59b4ff33816e7aed924babc5dbfadc7457949d781c678ed2b027bb80ca82070c44bc
-EBUILD dansguardian-2.12.0.3.ebuild 2844 SHA256 de4be80f800132299e32905bf5f6fbc6a4caafbe3a94a2e28c82ce1fca64339f SHA512 72934f4ddc1a55c2a5c42db3a7be0df7f0675b99ffb7f0ababdd8b5f21a5ab6ab42d1c91c1ba516dc19bca5df7087584517b24695f34ed35378ac962c7d708b0 WHIRLPOOL 61d32c949b716c6f13aa7932f9e05c1a462ece386b2bf598f7403195c3f3b070e1694bd87e092989267912af4b776b1cae8848a47b7e26804728a1e15c3c105e
-MISC ChangeLog 16668 SHA256 f32386d121c44462537a1989c1c7d41b896d652e9cfea2f21a28e3589e9fa88f SHA512 171362c68c0545a6812dd8ae3d5963e246072cb8863734116d93b1f70f344a611cf818fa87a7a52ebd871b7a6e5842ea5aef00d3ed2bc381da9174c601bc0ce1 WHIRLPOOL cbc9bfedb39c845bbf46b8152f8aafecf653d5a6dcf55e4a2e63d1ae9cb98d564fb6cabaec6dcbc84ed4e8b3d6e2854c0477b220631c3d047f01e77fca11f167
+EBUILD dansguardian-2.12.0.3-r2.ebuild 2912 SHA256 de3249ebd32df8ea02631b89658a520fcf374bfe457808b7ef06d463fd47486c SHA512 6761ae80be5bdf27aab627232ef696b6c33e4dd7a77fd2b6c25115571801c238c1d9660f3f2167929d2f7f3bb3257ecde09a1a2927dd6538a18ba6bce5751d76 WHIRLPOOL 7d14b9e4974e50255e958c22a8a0a6d77bf190b536e31a4bfea21a824c77f5de3724228e6dcd1e61e2df49f92108be4c2d1b4679c0599c8319f37600975ad882
+MISC ChangeLog 17212 SHA256 6605fdd4798b80bb3c65069d7708a2ff36cb4914ab15b9a33ef31631604f9532 SHA512 85d98506ca29a6e5d5d8c2ecdc329da745e69ec4dd757c196271239caaa38d49d90c82ec55eb9238756af3e3f53c7ec3679d83215d94ce6fa0666eeb9bd58227 WHIRLPOOL c776687800461dc353e7b9a072e94c8adde75d87e13b44c30ed0448ef8687b570ab9f1c64fcb85f5ee074a05123d1ae26109923a8c08a17421f8fd13028b3c4b
 MISC metadata.xml 1705 SHA256 3d45662a022d15d088bf28b82bb30f864b5ca5ef87fa2cf189432af8f2b6f82d SHA512 182ec9e70ccb9537c36f468eb0a203f54e9dc531a3b38d4d9deed8ac6dad69d7227c3b2c1d87fa4fa59f7cb42ab1725267f2ae539cc676808cc5e8662c81d8a6 WHIRLPOOL 6c3b528098426e69037117585c7c0111d9e3668c744a67789fbf8000b16f88261f8dbed5456cf30df810272de6e298f1ed53c42a4e9fb5dbed02f249d397961f
diff --git a/net-proxy/dansguardian/dansguardian-2.10.1.1.ebuild b/net-proxy/dansguardian/dansguardian-2.10.0.3-r1.ebuild
index 9bcfa3ab1c1e..2338bf359124 100644
--- a/net-proxy/dansguardian/dansguardian-2.10.1.1.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.10.0.3-r1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.1.1.ebuild,v 1.2 2012/05/03 04:35:53 jdhore Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.0.3-r1.ebuild,v 1.1 2013/04/09 18:36:01 tomwij Exp $
 
 inherit eutils
 
@@ -16,7 +14,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="clamav kaspersky debug ntlm pcre"
 
 RDEPEND="sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
+	pcre? ( >=dev-libs/libpcre-8.32 )
 	clamav? ( >=app-antivirus/clamav-0.93 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -40,18 +38,19 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
+src_unpack() {
+	unpack ${A}
+
 	epatch "${FILESDIR}"/${P}-gcc44.patch
 }
 
-src_configure() {
+src_compile() {
 	local myconf="--with-logdir=/var/log/dansguardian
 		--with-piddir=/var/run
 		--docdir=/usr/share/doc/${PF}
 		--htmldir=/usr/share/doc/${PF}/html
 		$(use_enable pcre)
 		$(use_enable ntlm)
-		--enable-orig-ip
 		--enable-fancydm
 		--enable-email"
 	if use clamav; then
@@ -68,14 +67,12 @@ src_configure() {
 	fi
 
 	econf ${myconf} || die "configure failed"
-}
 
-src_compile() {
 	emake OPTIMISE="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	emake "DESTDIR=${D}" install || die "emake install failed"
+	make "DESTDIR=${D}" install || die "make install failed"
 
 	# Move html documents to html dir
 	mkdir "${D}"/usr/share/doc/${PF}/html \
diff --git a/net-proxy/dansguardian/dansguardian-2.10.1.1-r1.ebuild b/net-proxy/dansguardian/dansguardian-2.10.1.1-r1.ebuild
deleted file mode 100644
index 5bd8ad2acef4..000000000000
--- a/net-proxy/dansguardian/dansguardian-2.10.1.1-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.1.1-r1.ebuild,v 1.2 2012/05/03 04:35:53 jdhore Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Web content filtering via proxy"
-HOMEPAGE="http://dansguardian.org"
-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"
-
-RDEPEND="sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	clamav? ( >=app-antivirus/clamav-0.93 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	if has_version "<${CATEGORY}/${PN}-2.9" ; then
-		ewarn "This version introduces brand new USE flags:"
-		ewarn "   clamav kaspersky ntlm pcre"
-		echo
-
-		local f="${ROOT}/etc/dansguardian"
-		f=${f//\/\///}
-		if [ -d "${f}" ] ; then
-			eerror "The structure of ${f} has changed in this version!"
-			eerror "For avoiding confusion, you must either move or delete the old ${f},"
-			eerror "then continue with the upgrade:"
-			eerror "   mv '${f}' '${f}.old'"
-			eerror "   emerge --resume"
-			die "Obsolete config files detected"
-		fi
-	fi
-
-	if ! use clamav; then
-		enewgroup dansguardian
-		enewuser dansguardian -1 -1 /dev/null dansguardian
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-}
-
-src_configure() {
-	local myconf="--with-logdir=/var/log/dansguardian
-		--with-piddir=/var/run
-		--docdir=/usr/share/doc/${PF}
-		--htmldir=/usr/share/doc/${PF}/html
-		$(use_enable pcre)
-		$(use_enable ntlm)
-		--enable-orig-ip
-		--enable-fancydm
-		--enable-email"
-	if use clamav; then
-		# readd --enable-clamav in the next version if it works with >=clamav-0.95 (#264820)
-		myconf="${myconf} --enable-clamd
-			--with-proxyuser=clamav
-			--with-proxygroup=clamav"
-	else
-		myconf="${myconf}
-			--with-proxyuser=dansguardian
-			--with-proxygroup=dansguardian"
-	fi
-	if use kaspersky; then
-		myconf="${myconf} --enable-kavd"
-	fi
-	if use debug; then
-		myconf="${myconf} --with-dgdebug=on"
-	fi
-
-	econf ${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake OPTIMISE="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake "DESTDIR=${D}" install || die "emake install failed"
-
-	# Move html documents to html dir
-	mkdir "${D}"/usr/share/doc/${PF}/html \
-		&& mv "${D}"/usr/share/doc/${PF}/*.html "${D}"/usr/share/doc/${PF}/html \
-		|| die "no html docs found in docdir"
-
-	# Copying init script
-	newinitd "${FILESDIR}/dansguardian.init" dansguardian
-
-	if use clamav; then
-		sed -r -i -e 's/[ \t]+use dns/& clamd/' "${D}/etc/init.d/dansguardian"
-		sed -r -i -e 's/^#( *contentscanner *=.*clamdscan[.]conf.*)/\1/' "${D}/etc/dansguardian/dansguardian.conf"
-		sed -r -i -e 's/^#( *clamdudsfile *=.*)/\1/' "${D}/etc/dansguardian/contentscanners/clamdscan.conf"
-	elif use kaspersky; then
-		sed -r -i -e 's/^#( *contentscanner *=.*kavdscan[.]conf.*)/\1/' "${D}/etc/dansguardian/dansguardian.conf"
-	fi
-
-	# Copying logrotation file
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/dansguardian.logrotate" dansguardian
-
-	keepdir /var/log/dansguardian
-	fperms o-rwx /var/log/dansguardian
-}
-
-pkg_postinst() {
-	local runas="dansguardian:dansguardian"
-	if use clamav ; then
-		runas="clamav:clamav"
-	else
-		elog "dansguardian runs as a dedicated user now"
-		elog "You may need to remove old ipc files or adjust their ownership."
-		elog "By default, those files are /tmp/.dguardianipc"
-		elog "and /tmp/.dguardianurlipc"
-	fi
-	einfo "The dansguardian daemon will run by default as ${runas}"
-
-	if [ -d "${ROOT}/var/log/dansguardian" ] ; then
-		chown -R ${runas} "${ROOT}/var/log/dansguardian"
-		chmod o-rwx "${ROOT}/var/log/dansguardian"
-	fi
-}
diff --git a/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild b/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild
deleted file mode 100644
index 4a06acd79809..000000000000
--- a/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild,v 1.2 2013/03/04 12:13:11 tomwij Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Web content filtering via proxy"
-HOMEPAGE="http://dansguardian.org"
-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"
-
-RDEPEND="sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	clamav? ( >=app-antivirus/clamav-0.93 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	if has_version "<${CATEGORY}/${PN}-2.9" ; then
-		ewarn "This version introduces brand new USE flags:"
-		ewarn "   clamav kaspersky ntlm pcre"
-		echo
-
-		local f="${ROOT}/etc/dansguardian"
-		f=${f//\/\///}
-		if [ -d "${f}" ] ; then
-			eerror "The structure of ${f} has changed in this version!"
-			eerror "For avoiding confusion, you must either move or delete the old ${f},"
-			eerror "then continue with the upgrade:"
-			eerror "   mv '${f}' '${f}.old'"
-			eerror "   emerge --resume"
-			die "Obsolete config files detected"
-		fi
-	fi
-
-	if ! use clamav; then
-		enewgroup dansguardian
-		enewuser dansguardian -1 -1 /dev/null dansguardian
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	epatch "${FILESDIR}"/${P}-pcre830.patch
-}
-
-src_configure() {
-	local myconf="--with-logdir=/var/log/dansguardian
-		--with-piddir=/var/run
-		--docdir=/usr/share/doc/${PF}
-		--htmldir=/usr/share/doc/${PF}/html
-		$(use_enable pcre)
-		$(use_enable ntlm)
-		--enable-orig-ip
-		--enable-fancydm
-		--enable-email"
-	if use clamav; then
-		# readd --enable-clamav in the next version if it works with >=clamav-0.95 (#264820)
-		myconf="${myconf} --enable-clamd
-			--with-proxyuser=clamav
-			--with-proxygroup=clamav"
-	else
-		myconf="${myconf}
-			--with-proxyuser=dansguardian
-			--with-proxygroup=dansguardian"
-	fi
-	if use kaspersky; then
-		myconf="${myconf} --enable-kavd"
-	fi
-	if use debug; then
-		myconf="${myconf} --with-dgdebug=on"
-	fi
-
-	econf ${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake OPTIMISE="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake "DESTDIR=${D}" install || die "emake install failed"
-
-	# Move html documents to html dir
-	mkdir "${D}"/usr/share/doc/${PF}/html \
-		&& mv "${D}"/usr/share/doc/${PF}/*.html "${D}"/usr/share/doc/${PF}/html \
-		|| die "no html docs found in docdir"
-
-	# Copying init script
-	newinitd "${FILESDIR}/dansguardian.init" dansguardian
-
-	if use clamav; then
-		sed -r -i -e 's/[ \t]+use dns/& clamd/' "${D}/etc/init.d/dansguardian"
-		sed -r -i -e 's/^#( *contentscanner *=.*clamdscan[.]conf.*)/\1/' "${D}/etc/dansguardian/dansguardian.conf"
-		sed -r -i -e 's/^#( *clamdudsfile *=.*)/\1/' "${D}/etc/dansguardian/contentscanners/clamdscan.conf"
-	elif use kaspersky; then
-		sed -r -i -e 's/^#( *contentscanner *=.*kavdscan[.]conf.*)/\1/' "${D}/etc/dansguardian/dansguardian.conf"
-	fi
-
-	# Copying logrotation file
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/dansguardian.logrotate" dansguardian
-
-	keepdir /var/log/dansguardian
-	fperms o-rwx /var/log/dansguardian
-}
-
-pkg_postinst() {
-	local runas="dansguardian:dansguardian"
-	if use clamav ; then
-		runas="clamav:clamav"
-	else
-		elog "dansguardian runs as a dedicated user now"
-		elog "You may need to remove old ipc files or adjust their ownership."
-		elog "By default, those files are /tmp/.dguardianipc"
-		elog "and /tmp/.dguardianurlipc"
-	fi
-	einfo "The dansguardian daemon will run by default as ${runas}"
-
-	if [ -d "${ROOT}/var/log/dansguardian" ] ; then
-		chown -R ${runas} "${ROOT}/var/log/dansguardian"
-		chmod o-rwx "${ROOT}/var/log/dansguardian"
-	fi
-}
diff --git a/net-proxy/dansguardian/dansguardian-2.12.0.3.ebuild b/net-proxy/dansguardian/dansguardian-2.12.0.3-r2.ebuild
index 5a064160694a..58a2dcd3cf50 100644
--- a/net-proxy/dansguardian/dansguardian-2.12.0.3.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.12.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.12.0.3.ebuild,v 1.1 2013/03/04 12:13:11 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.12.0.3-r2.ebuild,v 1.1 2013/04/09 18:36:01 tomwij Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ RDEPEND="sys-libs/zlib
 	clamav? ( app-antivirus/clamav )
 	logrotate? ( app-admin/logrotate )
 	ntlm? ( virtual/libiconv )
-	pcre? ( dev-libs/libpcre )"
+	pcre? ( >=dev-libs/libpcre-8.32 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -31,12 +31,17 @@ pkg_setup() {
 }
 
 src_configure() {
+	local debug
+	if use debug ; then
+		debug="$(use_with debug dgdebug)"
+	fi
+
 	econf \
 		$(use_enable avast avastd) \
 		$(use_enable backtrace segv-backtrace) \
 		$(use_enable clamav clamd) \
 		$(use_enable commandline) \
-		$(use_with debug dgdebug) \
+		${debug} \
 		$(use_enable email) \
 		$(use_enable fancydm) \
 		$(use_enable icap) \