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.

(Portage version: 2.1.11.60/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

5 files changed, 28 insertions, 274 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/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) \