Add a blocker on the split out recursor.

(Portage version: 2.1_pre10)

7 files changed, 25 insertions, 14 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 02f9109ec0cb..b6ad6bdee13c 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/pdns
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.29 2006/04/27 21:43:24 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.30 2006/04/30 00:14:14 swegener Exp $
+
+  30 Apr 2006; Sven Wegener <swegener@gentoo.org> files/pdns,
+  files/precursor, files/recursor.conf, pdns-2.9.18.ebuild,
+  pdns-2.9.19-r2.ebuild, pdns-2.9.20.ebuild:
+  Add a blocker on the split out recursor.
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-pdns-2.9.18,
   Manifest:
diff --git a/net-dns/pdns/files/pdns b/net-dns/pdns/files/pdns
index 82ec1ff15e4b..3e7826027b24 100644
--- a/net-dns/pdns/files/pdns
+++ b/net-dns/pdns/files/pdns
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/files/pdns,v 1.6 2006/01/20 19:03:54 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/files/pdns,v 1.7 2006/04/30 00:14:14 swegener Exp $
 
 opts="${opts} reload monitor dump"
 
diff --git a/net-dns/pdns/files/precursor b/net-dns/pdns/files/precursor
index f2da0e822431..1f0714a60d32 100644
--- a/net-dns/pdns/files/precursor
+++ b/net-dns/pdns/files/precursor
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/files/precursor,v 1.1 2005/07/17 04:50:51 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/files/precursor,v 1.2 2006/04/30 00:14:14 swegener Exp $
 
 depend() {
 	need net
diff --git a/net-dns/pdns/files/recursor.conf b/net-dns/pdns/files/recursor.conf
index 7b7d81597135..b4cd29a8fe97 100644
--- a/net-dns/pdns/files/recursor.conf
+++ b/net-dns/pdns/files/recursor.conf
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/files/recursor.conf,v 1.1 2005/07/17 04:50:51 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/files/recursor.conf,v 1.2 2006/04/30 00:14:14 swegener Exp $
 
 # Drop uid
 setuid=nobody
@@ -16,3 +16,6 @@ local-address=127.0.0.1
 
 # Local port to bind to
 local-port=53
+
+# Change root for safety
+chroot=/var/empty
diff --git a/net-dns/pdns/pdns-2.9.18.ebuild b/net-dns/pdns/pdns-2.9.18.ebuild
index 7d711cd82cdb..0c3d3a97f39f 100644
--- a/net-dns/pdns/pdns-2.9.18.ebuild
+++ b/net-dns/pdns/pdns-2.9.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.18.ebuild,v 1.7 2005/07/30 00:02:40 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.18.ebuild,v 1.8 2006/04/30 00:14:14 swegener Exp $
 
 inherit eutils
 
@@ -19,7 +19,8 @@ DEPEND="mysql? ( >=dev-db/mysql-3.23.54a )
 	recursor? ( >=dev-libs/boost-1.31 )
 	tdb? ( dev-libs/tdb )"
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	recursor? ( !net-dns/pdns-recursor )"
 
 DEPEND="${DEPEND}
 	doc? ( app-doc/doxygen )"
diff --git a/net-dns/pdns/pdns-2.9.19-r2.ebuild b/net-dns/pdns/pdns-2.9.19-r2.ebuild
index c7ca20845e06..b03129be4960 100644
--- a/net-dns/pdns/pdns-2.9.19-r2.ebuild
+++ b/net-dns/pdns/pdns-2.9.19-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.19-r2.ebuild,v 1.1 2006/03/01 22:28:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.19-r2.ebuild,v 1.2 2006/04/30 00:14:14 swegener Exp $
 
 inherit eutils
 
@@ -19,7 +19,8 @@ DEPEND="mysql? ( >=dev-db/mysql-3.23.54a )
 	tdb? ( dev-libs/tdb )
 	>=dev-libs/boost-1.31"
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	recursor? ( !net-dns/pdns-recursor )"
 
 DEPEND="${DEPEND}
 	doc? ( app-doc/doxygen )"
diff --git a/net-dns/pdns/pdns-2.9.20.ebuild b/net-dns/pdns/pdns-2.9.20.ebuild
index 5fbb2b7f80a9..354426b4bd52 100644
--- a/net-dns/pdns/pdns-2.9.20.ebuild
+++ b/net-dns/pdns/pdns-2.9.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.20.ebuild,v 1.3 2006/04/06 20:26:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.20.ebuild,v 1.4 2006/04/30 00:14:14 swegener Exp $
 
 inherit multilib eutils
 
@@ -19,7 +19,8 @@ DEPEND="mysql? ( >=dev-db/mysql-3.23.54a )
 	tdb? ( dev-libs/tdb )
 	>=dev-libs/boost-1.31"
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	recursor? ( !net-dns/pdns-recursor )"
 
 DEPEND="${DEPEND}
 	doc? ( app-doc/doxygen )"